#!/bin/sh

DIR="/mnt/Development/CARBLogger/carblogger/branches/CARBLogger_UI_jwicks.1/ancillary"

DRY_RUN=""
if [ "x$1" == "--dry-run" ]; then
  DRY_RUN="--dry-run"
fi
PROD_REV=$(svn info ${DIR} | grep "^Last Changed Rev:" | awk '{print $4}')
svn $DRY_RUN merge -r $PROD_REV:HEAD trunk ${DIR}


